From 6b750fd711e1debe688ed431534342725386ab4b Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Mon, 19 Jun 2006 12:13:11 -0600 Subject: [PATCH] [IA64] add volatile to mpt_table mpt_table is accessed concurrently by cpus, so it needs volatile qualifier Signed-off-by: Isaku Yamahata --- xen/arch/ia64/xen/xenmem.c | 12 ++++++------ xen/include/asm-ia64/mm.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/ia64/xen/xenmem.c b/xen/arch/ia64/xen/xenmem.c index ebdba3b19c..49b6c55588 100644 --- a/xen/arch/ia64/xen/xenmem.c +++ b/xen/arch/ia64/xen/xenmem.c @@ -35,7 +35,7 @@ unsigned long max_page; /* * Set up the page tables. */ -unsigned long *mpt_table; +volatile unsigned long *mpt_table; void paging_init (void) @@ -139,18 +139,18 @@ create_frametable_page_table (u64 start, u64 end, void *arg) static int create_mpttable_page_table (u64 start, u64 end, void *arg) { + unsigned long map_start, map_end; unsigned long address, start_page, end_page; - unsigned long *map_start, *map_end; pgd_t *pgd; pud_t *pud; pmd_t *pmd; pte_t *pte; - map_start = mpt_table + (__pa(start) >> PAGE_SHIFT); - map_end = mpt_table + (__pa(end) >> PAGE_SHIFT); + map_start = (unsigned long)(mpt_table + (__pa(start) >> PAGE_SHIFT)); + map_end = (unsigned long)(mpt_table + (__pa(end) >> PAGE_SHIFT)); - start_page = (unsigned long) map_start & PAGE_MASK; - end_page = PAGE_ALIGN((unsigned long) map_end); + start_page = map_start & PAGE_MASK; + end_page = PAGE_ALIGN(map_end); for (address = start_page; address < end_page; address += PAGE_SIZE) { pgd = frametable_pgd_offset(address); diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h index 37d77aded4..8f4be39099 100644 --- a/xen/include/asm-ia64/mm.h +++ b/xen/include/asm-ia64/mm.h @@ -443,7 +443,7 @@ extern unsigned long dom0vp_zap_physmap(struct domain *d, unsigned long gpfn, un extern unsigned long dom0vp_add_physmap(struct domain* d, unsigned long gpfn, unsigned long mfn, unsigned long flags, domid_t domid); #endif -extern unsigned long *mpt_table; +extern volatile unsigned long *mpt_table; extern unsigned long gmfn_to_mfn_foreign(struct domain *d, unsigned long gpfn); extern u64 translate_domain_pte(u64 pteval, u64 address, u64 itir__, u64* logps); #define machine_to_phys_mapping mpt_table -- 2.30.2